Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <[email protected]>
Fri, 20 Jul 2012 06:55:38 +0000 (08:55 +0200)
committerWolfgang Denk <[email protected]>
Fri, 20 Jul 2012 06:55:38 +0000 (08:55 +0200)
* 'master' of git://git.denx.de/u-boot-net:
  net: link_local: fix build
  net: bootp: fix build

Signed-off-by: Wolfgang Denk <[email protected]>

Trivial merge